load images at normal size.

Thu Sep 16 02:07:56 2004  Jonathan Blandford  <jrb@gnome.org>

        * docs/tools/widgets.c (create_icon_view): load images at normal
        size.

        * docs/reference/gtk/images/*png: Update shots.

diff --git a/ChangeLog b/ChangeLog
index d1443d531cab00262c76c67eb74c76c964465000..a9e79245849891a7fe9e2aab60c1317583ede75c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Sep 16 02:07:56 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * docs/tools/widgets.c (create_icon_view): load images at normal
+       size.
+
+       * docs/reference/gtk/images/*png: Update shots.
+
 Thu Sep 16 00:33:11 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * docs/tools/widgets.c (new_widget_info): Add constrained sizing

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d1443d531cab00262c76c67eb74c76c964465000..a9e79245849891a7fe9e2aab60c1317583ede75c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu Sep 16 02:07:56 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * docs/tools/widgets.c (create_icon_view): load images at normal
+       size.
+
+       * docs/reference/gtk/images/*png: Update shots.
+
 Thu Sep 16 00:33:11 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * docs/tools/widgets.c (new_widget_info): Add constrained sizing

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d1443d531cab00262c76c67eb74c76c964465000..a9e79245849891a7fe9e2aab60c1317583ede75c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu Sep 16 02:07:56 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * docs/tools/widgets.c (create_icon_view): load images at normal
+       size.
+
+       * docs/reference/gtk/images/*png: Update shots.
+
 Thu Sep 16 00:33:11 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * docs/tools/widgets.c (new_widget_info): Add constrained sizing

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d1443d531cab00262c76c67eb74c76c964465000..a9e79245849891a7fe9e2aab60c1317583ede75c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu Sep 16 02:07:56 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * docs/tools/widgets.c (create_icon_view): load images at normal
+       size.
+
+       * docs/reference/gtk/images/*png: Update shots.
+
 Thu Sep 16 00:33:11 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * docs/tools/widgets.c (new_widget_info): Add constrained sizing

diff --git a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
index 2757d674b977a1f5c8f97bf87c159612cfe1e981..8e1a1fb41318d4232c3db826da3d8e5f7c5d0f2b 100644 (file)
--- a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
@@ -60,9 +60,11 @@ End:
 @filename: 
 @width: 
 @height: 
-@keep_aspect_ratio: 
+@preserve_aspect_ratio: 
 @error: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@keep_aspect_ratio: 
 
 
 <!-- ##### FUNCTION gdk_pixbuf_get_file_info ##### -->

diff --git a/docs/reference/gdk/tmpl/event_structs.sgml b/docs/reference/gdk/tmpl/event_structs.sgml
index cad1ae5541ab912daf3e9d2bcd59acbf717fb815..b3c80366b61034f1018931f5eb5408bb668e464f 100644 (file)
--- a/docs/reference/gdk/tmpl/event_structs.sgml
+++ b/docs/reference/gdk/tmpl/event_structs.sgml
@@ -417,7 +417,7 @@ only available if the X server supports the XFIXES extension.
 @owner: the new owner of the selection
 @reason: the reason for the ownership change as a #GdkOwnerChange value
 @selection: the atom identifying the selection
-@time: the timestamp of the event 
+@time: the timestamp of the event
 @selection_time: the time at which the selection ownership was taken over
 
 <!-- ##### ENUM GdkScrollDirection ##### -->
@@ -509,3 +509,4 @@ Specifies why a selection ownership was changed.
 @GDK_OWNER_CHANGE_NEW_OWNER: some other app claimed the ownership
 @GDK_OWNER_CHANGE_DESTROY: the window was destroyed
 @GDK_OWNER_CHANGE_CLOSE: the client was closed
+

diff --git a/docs/reference/gdk/tmpl/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml
index 22849e1fcb9a6cc2625d3bb5f24a8e808bc6794b..d7c3d97e9a25e5e5e43db8c692f08d6e202f0afe 100644 (file)
--- a/docs/reference/gdk/tmpl/rgb.sgml
+++ b/docs/reference/gdk/tmpl/rgb.sgml
@@ -450,7 +450,7 @@ about which dither mode is desired; if the display is not ditherable, it may
 make sense to gray out or hide the corresponding UI widget.
 </para>
 
-@cmap: a #GdkColormap 
+@cmap: a #GdkColormap
 @Returns: %TRUE if the visual associated with @cmap is ditherable.
 
 

diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml
index 765ea06b0ce1cf52617bf1bf531e11aff07c6e00..e1ddb66f12b4f669a1ee96c1afce0eb22be946bc 100644 (file)
--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/docs/reference/gdk/tmpl/windows.sgml
@@ -723,6 +723,22 @@ Registers a window as a potential drop destination.
 @y_offset: 
 
 
+<!-- ##### FUNCTION gdk_window_enable_synchronized_configure ##### -->
+<para>
+
+</para>
+
+@window: 
+
+
+<!-- ##### FUNCTION gdk_window_configure_finished ##### -->
+<para>
+
+</para>
+
+@window: 
+
+
 <!-- ##### FUNCTION gdk_window_set_user_data ##### -->
 <para>
 

diff --git a/docs/reference/gtk/images/accel-label.png b/docs/reference/gtk/images/accel-label.png
index bcc3324b4aaf475a6440ecb2b573119f1ca7b3a6..2cd2363b78a79a76c2c29ba373341e8078617806 100644 (file)
Binary files a/docs/reference/gtk/images/accel-label.png and b/docs/reference/gtk/images/accel-label.png differ

diff --git a/docs/reference/gtk/images/button.png b/docs/reference/gtk/images/button.png
index 9e7967d28f060f2dec78f46bc98b0a38be6c1853..78bf3cccf30d6518d3b60c9c8e1677a256c4a6ee 100644 (file)
Binary files a/docs/reference/gtk/images/button.png and b/docs/reference/gtk/images/button.png differ

diff --git a/docs/reference/gtk/images/check-button.png b/docs/reference/gtk/images/check-button.png
index d5a5da5f21fbee54aade0b46748eb604d26c76d3..64f008e5262d73dd2a21698386f9131d30659197 100644 (file)
Binary files a/docs/reference/gtk/images/check-button.png and b/docs/reference/gtk/images/check-button.png differ

diff --git a/docs/reference/gtk/images/color-button.png b/docs/reference/gtk/images/color-button.png
index 945cc37e107c2fbf21920ac7ca088402c89354e5..6369cd54af1d6650dd91e002b57643c426a3f48f 100644 (file)
Binary files a/docs/reference/gtk/images/color-button.png and b/docs/reference/gtk/images/color-button.png differ

diff --git a/docs/reference/gtk/images/combo-box-entry.png b/docs/reference/gtk/images/combo-box-entry.png
index 14a2ad141a4305bf7f67d3929051be1149b93c7c..8f6f5167a9a4c1cf27ea0b92da3eb9ecae027257 100644 (file)
Binary files a/docs/reference/gtk/images/combo-box-entry.png and b/docs/reference/gtk/images/combo-box-entry.png differ

diff --git a/docs/reference/gtk/images/entry.png b/docs/reference/gtk/images/entry.png
index 7c18542b0135ba288dcc23c3bbba47be56fefe08..4786ec7b1121f966a22e62d90afcd6b4c537d0ea 100644 (file)
Binary files a/docs/reference/gtk/images/entry.png and b/docs/reference/gtk/images/entry.png differ

diff --git a/docs/reference/gtk/images/file-button.png b/docs/reference/gtk/images/file-button.png
index 59974c2835fcd277a4381daa4d239d49e9c1d526..04e8ef781055ed8581af5f5d2f4f16ccb34da6a3 100644 (file)
Binary files a/docs/reference/gtk/images/file-button.png and b/docs/reference/gtk/images/file-button.png differ

diff --git a/docs/reference/gtk/images/font-button.png b/docs/reference/gtk/images/font-button.png
index ee24e2fa67c3e9727b1f51dfe9080a6ac1eef527..a3937da7de0c085cfb0b2768940c5c24e8e98968 100644 (file)
Binary files a/docs/reference/gtk/images/font-button.png and b/docs/reference/gtk/images/font-button.png differ

diff --git a/docs/reference/gtk/images/frame.png b/docs/reference/gtk/images/frame.png
index 563378ab7ad8b44cdaad2c09128c67f79aca6715..18e4f9794436df4909d6965a34fadea63bc4b0d5 100644 (file)
Binary files a/docs/reference/gtk/images/frame.png and b/docs/reference/gtk/images/frame.png differ

diff --git a/docs/reference/gtk/images/icon-view.png b/docs/reference/gtk/images/icon-view.png
index b3a6ab77fd1b69f8ac3431b8cb62d8cc48b3adb4..ce53787cbf71bdb69bd57768dbaded1f02c74825 100644 (file)
Binary files a/docs/reference/gtk/images/icon-view.png and b/docs/reference/gtk/images/icon-view.png differ

diff --git a/docs/reference/gtk/images/label.png b/docs/reference/gtk/images/label.png
index b7fc982a4707f21961daaa1be410b5179ab6cf1a..abb3f3cda5b0f0c467b6468b13c8cedec777ce6a 100644 (file)
Binary files a/docs/reference/gtk/images/label.png and b/docs/reference/gtk/images/label.png differ

diff --git a/docs/reference/gtk/images/list-and-tree.png b/docs/reference/gtk/images/list-and-tree.png
index 260bf4f05e09ff0e688fd344c9b5a7014233851a..0c6d2ec8e8fb0fdc725bb44ad857fbe9fcc388ce 100644 (file)
Binary files a/docs/reference/gtk/images/list-and-tree.png and b/docs/reference/gtk/images/list-and-tree.png differ

diff --git a/docs/reference/gtk/images/multiline-text.png b/docs/reference/gtk/images/multiline-text.png
index 7bdeb2fb11ae3bc71f132fcac35776618a6487f8..2e3229584f2bdd3f72b997d3a9e25b3e61f3acd9 100644 (file)
Binary files a/docs/reference/gtk/images/multiline-text.png and b/docs/reference/gtk/images/multiline-text.png differ

diff --git a/docs/reference/gtk/images/panes.png b/docs/reference/gtk/images/panes.png
index 4f8f20ba3651033691728df25fe72aede9e9187a..be3b15069425c31269ab772be09f6f422d584d1d 100644 (file)
Binary files a/docs/reference/gtk/images/panes.png and b/docs/reference/gtk/images/panes.png differ

diff --git a/docs/reference/gtk/images/radio-group.png b/docs/reference/gtk/images/radio-group.png
index c08588aa0e8489ee31a3eca13589f007e3a765b4..092a35db9c5b8a3953b452766ef079fb0edeb495 100644 (file)
Binary files a/docs/reference/gtk/images/radio-group.png and b/docs/reference/gtk/images/radio-group.png differ

diff --git a/docs/reference/gtk/images/separator.png b/docs/reference/gtk/images/separator.png
index f1277fd96b92df37fd265164ba87c7dd89a8188d..9d2ae4d1a75fa0adbdd1c737982e2511433d83ad 100644 (file)
Binary files a/docs/reference/gtk/images/separator.png and b/docs/reference/gtk/images/separator.png differ

diff --git a/docs/reference/gtk/images/toggle-button.png b/docs/reference/gtk/images/toggle-button.png
index a0d7a59c944920e8622adc9c61b8c7c157b44670..d147d0e7e06d1edd05a481b27abf3b48c026e16d 100644 (file)
Binary files a/docs/reference/gtk/images/toggle-button.png and b/docs/reference/gtk/images/toggle-button.png differ

diff --git a/docs/reference/gtk/images/window.png b/docs/reference/gtk/images/window.png
index 56133166bdc04fa570477327ccdae19a4f9e3415..926a7730222ed76bff1fd7e19c40c8df9d1129de 100644 (file)
Binary files a/docs/reference/gtk/images/window.png and b/docs/reference/gtk/images/window.png differ

diff --git a/docs/tools/README.shooter b/docs/tools/README.shooter
new file mode 100644 (file)
index 0000000..14f7072
--- /dev/null
+++ b/docs/tools/README.shooter
@@ -0,0 +1,13 @@
+The doc shooter is used to take screenshots of widgets for the GTK+
+reference manuals.  We use these images for both the headers of the
+images, and for the visual index of GNOME images.  They aren't part of
+the docs build.  Instead, the images are taken, and then copied by hand
+into gtk+/docs/reference/gtk/images/
+
+Ideally, the images should be taken once a release, and all images
+should be updated at the same time.  A simple theme should be used to
+take the screenshots, and in the future, we may include a gtkrc file in
+this directory for the shooter to use.  Currently, all shots are
+constrained to the same width.  Care should be taken when adding new
+widgets to keep this constraint.
+

diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 07d6f80bad813b87779aacbc8f55eac54a184e7b..a14299497fc9c5969ff8ab5b7d6e5ec3a23f8b05 100644 (file)
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -245,10 +245,10 @@ create_icon_view (void)
   gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN);
   list_store = gtk_list_store_new (2, G_TYPE_STRING, GDK_TYPE_PIXBUF);
   gtk_list_store_append (list_store, &iter);
-  pixbuf = gdk_pixbuf_new_from_file_at_size ("gnome-gmush.png", 20, 20, NULL);
+  pixbuf = gdk_pixbuf_new_from_file ("gnome-gmush.png", NULL);
   gtk_list_store_set (list_store, &iter, 0, "One", 1, pixbuf, -1);
   gtk_list_store_append (list_store, &iter);
-  pixbuf = gdk_pixbuf_new_from_file_at_size ("gnome-foot.png", 20, 20, NULL);
+  pixbuf = gdk_pixbuf_new_from_file ("gnome-foot.png", NULL);
   gtk_list_store_set (list_store, &iter, 0, "Two", 1, pixbuf, -1);
 
   icon_view = gtk_icon_view_new();

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 4c7bd27788f70c1b4dec61ffbe338a0ff70bca56..6516ff11fcd11e9e201725d5bf836f31adf6650c 100644 (file)
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1414,6 +1414,10 @@ gtk_cell_renderer_text_get_size (GtkCellRenderer *cell,
        {
          *x_offset = ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
                       (1.0 - cell->xalign) : cell->xalign) * (cell_area->width - rect.width - (2 * cell->xpad));
+         if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+           *x_offset -= rect.width;
+         if (celltext->text && !strcmp ("Makefile", celltext->text))
+           g_print ("x_offset: %d %d %d\n", cell_area->width, *x_offset, rect.width);
          *x_offset = MAX (*x_offset, 0);
        }
       if (y_offset)
@@ -1505,6 +1509,8 @@ gtk_cell_renderer_text_render (GtkCellRenderer      *cell,
   else
     pango_layout_set_width (layout, -1);
   
+  if (celltext->text && !strcmp ("Makefile", celltext->text))
+    g_print ("render: %d %d %d\n", cell_area->x, cell_area->width, cell_area->x + x_offset + cell->xpad);
   gtk_paint_layout (widget->style,
                     window,
                     state,
@@ -1515,6 +1521,12 @@ gtk_cell_renderer_text_render (GtkCellRenderer      *cell,
                     cell_area->x + x_offset + cell->xpad,
                     cell_area->y + y_offset + cell->ypad,
                     layout);
+  gdk_draw_line (window, widget->style->black_gc,
+                cell_area->x + x_offset + cell->xpad,
+                cell_area->y + y_offset + cell->ypad,
+                cell_area->x + x_offset + cell->xpad,
+                cell_area->y + y_offset + cell->ypad + 20);
+
 
   g_object_unref (layout);
 }